Remove the configure.in check for fontconfig entirely; it's not needed,

Mon Feb 23 11:20:34 2004  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Remove the configure.in check for fontconfig
        entirely; it's not needed, since PangoXft implies that sufficiently
        new fontconfig is present.

diff --git a/ChangeLog b/ChangeLog
index 257f96a2c1db1f228ff40b040937ac6e95418c87..eb3c62f68d91f2567fb35ec80776e942851ff396 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 23 11:20:34 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in: Remove the configure.in check for fontconfig 
+       entirely; it's not needed, since PangoXft implies that sufficiently
+       new fontconfig is present.
+
 Mon Feb 23 02:26:53 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkpathbar.c (gtk_path_bar_finalize):
@@ -44,9 +50,6 @@ Sat Feb 21 19:09:55 2004  Manish Singh  <yosh@gimp.org>
        * gtk/gtksettings.c (gtk_default_substitute): Guard the FC_HINT_STYLE
        stuff with an #ifdef, so we still build with most fontconfig versions.
 
-       * configure.in: Bump the fontconfig version requirement down to 1.0.1,
-       to match pango (probably isn't needed at all, but doesn't hurt).
-
 Sun Feb 22 03:03:29 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkaction.c: (gtk_action_finalize):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 257f96a2c1db1f228ff40b040937ac6e95418c87..eb3c62f68d91f2567fb35ec80776e942851ff396 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Feb 23 11:20:34 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in: Remove the configure.in check for fontconfig 
+       entirely; it's not needed, since PangoXft implies that sufficiently
+       new fontconfig is present.
+
 Mon Feb 23 02:26:53 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkpathbar.c (gtk_path_bar_finalize):
@@ -44,9 +50,6 @@ Sat Feb 21 19:09:55 2004  Manish Singh  <yosh@gimp.org>
        * gtk/gtksettings.c (gtk_default_substitute): Guard the FC_HINT_STYLE
        stuff with an #ifdef, so we still build with most fontconfig versions.
 
-       * configure.in: Bump the fontconfig version requirement down to 1.0.1,
-       to match pango (probably isn't needed at all, but doesn't hurt).
-
 Sun Feb 22 03:03:29 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkaction.c: (gtk_action_finalize):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 257f96a2c1db1f228ff40b040937ac6e95418c87..eb3c62f68d91f2567fb35ec80776e942851ff396 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Feb 23 11:20:34 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in: Remove the configure.in check for fontconfig 
+       entirely; it's not needed, since PangoXft implies that sufficiently
+       new fontconfig is present.
+
 Mon Feb 23 02:26:53 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkpathbar.c (gtk_path_bar_finalize):
@@ -44,9 +50,6 @@ Sat Feb 21 19:09:55 2004  Manish Singh  <yosh@gimp.org>
        * gtk/gtksettings.c (gtk_default_substitute): Guard the FC_HINT_STYLE
        stuff with an #ifdef, so we still build with most fontconfig versions.
 
-       * configure.in: Bump the fontconfig version requirement down to 1.0.1,
-       to match pango (probably isn't needed at all, but doesn't hurt).
-
 Sun Feb 22 03:03:29 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkaction.c: (gtk_action_finalize):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 257f96a2c1db1f228ff40b040937ac6e95418c87..eb3c62f68d91f2567fb35ec80776e942851ff396 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Feb 23 11:20:34 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in: Remove the configure.in check for fontconfig 
+       entirely; it's not needed, since PangoXft implies that sufficiently
+       new fontconfig is present.
+
 Mon Feb 23 02:26:53 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkpathbar.c (gtk_path_bar_finalize):
@@ -44,9 +50,6 @@ Sat Feb 21 19:09:55 2004  Manish Singh  <yosh@gimp.org>
        * gtk/gtksettings.c (gtk_default_substitute): Guard the FC_HINT_STYLE
        stuff with an #ifdef, so we still build with most fontconfig versions.
 
-       * configure.in: Bump the fontconfig version requirement down to 1.0.1,
-       to match pango (probably isn't needed at all, but doesn't hurt).
-
 Sun Feb 22 03:03:29 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkaction.c: (gtk_action_finalize):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 257f96a2c1db1f228ff40b040937ac6e95418c87..eb3c62f68d91f2567fb35ec80776e942851ff396 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Feb 23 11:20:34 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in: Remove the configure.in check for fontconfig 
+       entirely; it's not needed, since PangoXft implies that sufficiently
+       new fontconfig is present.
+
 Mon Feb 23 02:26:53 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkpathbar.c (gtk_path_bar_finalize):
@@ -44,9 +50,6 @@ Sat Feb 21 19:09:55 2004  Manish Singh  <yosh@gimp.org>
        * gtk/gtksettings.c (gtk_default_substitute): Guard the FC_HINT_STYLE
        stuff with an #ifdef, so we still build with most fontconfig versions.
 
-       * configure.in: Bump the fontconfig version requirement down to 1.0.1,
-       to match pango (probably isn't needed at all, but doesn't hurt).
-
 Sun Feb 22 03:03:29 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkaction.c: (gtk_action_finalize):

diff --git a/configure.in b/configure.in
index a592689a84b488a2ccfa88d29ba5435bc2fbae2a..bf1904ca9fa35c228d644f65eaa742b3b2b1321f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -991,13 +991,6 @@ if test "x$gdktarget" = "xlinux-fb" || test "x$gdktarget" = "xx11" ; then
 fi
 
 if test "x$gdktarget" = "xx11"; then
-  #
-  # Check for fontconfig 
-  #
-  if $PKG_CONFIG --exists 'fontconfig >= 2.2.91' ; then : ; else
-    AC_MSG_ERROR([fontconfig 2.2.91 is required for x11 target])
-  fi
-
   # We start off with the libraries from Pango
 
   ## be sure we also have Pango built with Xft2 support